bitkeeper revision 1.1293 (425cf706gdIucn9n9UpmnZgk5ZwITQ)
authorvh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk>
Wed, 13 Apr 2005 10:40:06 +0000 (10:40 +0000)
committervh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk>
Wed, 13 Apr 2005 10:40:06 +0000 (10:40 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/vh249/xen-unstable.bk


Trivial merge